From: Colin Walters <walters@verbum.org>
Date: Fri, 6 Jun 2014 20:17:05 +0000 (-0400)
Subject: pull: Emit a better error if the remote isn't found
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1169
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bb043b319f0a399608c89ce32472468199083e6d;p=ostree.git

pull: Emit a better error if the remote isn't found

The generic GKeyFile error isn't quite informative enough here.

I hit this with the new compose process where we don't automatically
inject a configured remote into the generated disk images; we expect
people to add them.

https://bugzilla.gnome.org/show_bug.cgi?id=731346
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index dbcdc405..d15e3369 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1067,8 +1067,16 @@ ostree_repo_pull (OstreeRepo               *self,
   config = ostree_repo_get_config (self);
 
   remote_key = g_strdup_printf ("remote \"%s\"", pull_data->remote_name);
+  if (!g_key_file_has_group (config, remote_key))
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "No remote '%s' found in " SYSCONFDIR "/ostree/remotes.d",
+                   remote_key);
+      goto out;
+    }
   if (!repo_get_string_key_inherit (self, remote_key, "url", &baseurl, error))
     goto out;
+
   pull_data->base_uri = soup_uri_new (baseurl);
 
 #ifdef HAVE_GPGME